javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff

diff --git a/configure.ac b/configure.ac
index 2d3544e78551bb58822cb80f809efae334d0d82e..b9fd794cc1d7cd6c8031ee265d5b85264aba2aa5 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a9b542d082d85f40196ed49734355353f466005a..707829a13df4aa119b7ac37e9e1aaf1d1989dc88 100644 (file)
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
                $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
                $(call gb_Package_get_target,odk_docs) \
                $(call gb_Package_get_target,odk_html) \
-               $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+               $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
                $(call gb_Package_get_target,odk_lib) \
                $(call gb_Package_get_target,odk_settings) \
                $(call gb_Package_get_target,odk_settings_generated) \

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 50da7d2c7fb65ca8b006dbaee5f73aee6ac79d3b..6976da57e59fb93cb7f655da358b047f65d28935 100644 (file)
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
        $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
        CustomTarget_classes \
-       CustomTarget_javadoc \
-       GeneratedPackage_odk_javadoc \
        GeneratedPackage_uno_loader_classes \
        $(if $(filter WNT,$(OS)),Library_unowinreg) \
        Package_unowinreg \
+       $(if $(JAVADOC),\
+               CustomTarget_javadoc \
+               GeneratedPackage_odk_javadoc \
+       ) \
 ))
 endif
 

diff --git a/odk/util/check.pl b/odk/util/check.pl
index 899b42cca0e8182eb49620358e6570c80bc2be22..2c7a7805c1ed4ceb7d65f9aa18112a6f571567d2 100644 (file)
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -188,7 +188,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {

diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 0669195323f54d678cbea34ce2ccac2157788c33..09a89f5c32301b2c8613a73c0c2d2b76a509f2cd 100644 (file)
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -17,6 +17,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
 ))
 endif
 
+ifneq ($(JAVADOC),)
+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+       -DJAVADOC \
+))
+endif
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
     scp2/source/sdkoo/sdkoo \
 ))

diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f73e3e8ef59ea6f13de38861ec1b085426555b0a..abfeb880320b0eae595916f7f1b1a377df86bab2 100644 (file)
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -126,6 +126,7 @@ File gid_File_Package_odk_html
 End
 
 #if defined(ENABLE_JAVA)
+#if defined(JAVADOC)
 File gid_File_Package_odk_javadoc
     TXT_FILE_BODY;
     Dir = FILELIST_SDK_DIR;
@@ -133,6 +134,7 @@ File gid_File_Package_odk_javadoc
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif
+#endif
 
 File gid_File_Package_odk_lib
     TXT_FILE_BODY;